docs: enum cleanup

scrolledwindow part 2

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index e99d8ccecd724194160632c609b1b189a8062c78..b7f71d1df58ad2e16743408f7f9e0b1fc8010e9d 100644 (file)
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -3119,6 +3119,7 @@ gtk_scrolled_window_get_hadjustment
 gtk_scrolled_window_get_vadjustment
 gtk_scrolled_window_get_hscrollbar
 gtk_scrolled_window_get_vscrollbar
+GtkPolicyType
 gtk_scrolled_window_set_policy
 gtk_scrolled_window_add_with_viewport
 GtkCornerType
@@ -6522,7 +6523,6 @@ GtkOrientation
 GtkPackType
 GtkPathPriorityType
 GtkPathType
-GtkPolicyType
 GtkPositionType
 GtkReliefStyle
 GtkResizeMode

diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index daaa604ea35562a08b81fcb1511bd261a8da8aa3..be3bd75ef270962f180a746bf331ab3263f3e42a 100644 (file)
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -360,29 +360,6 @@ typedef enum
   GTK_ORIENTATION_VERTICAL
 } GtkOrientation;
 
-/**
- * GtkCornerType:
- * @GTK_CORNER_TOP_LEFT: Place the scrollbars on the right and bottom of the
- *  widget (default behaviour).
- * @GTK_CORNER_BOTTOM_LEFT: Place the scrollbars on the top and right of the
- *  widget.
- * @GTK_CORNER_TOP_RIGHT: Place the scrollbars on the left and bottom of the
- *  widget.
- * @GTK_CORNER_BOTTOM_RIGHT: Place the scrollbars on the top and left of the
- *  widget.
- *
- * Specifies which corner a child widget should be placed in when packed into
- * a #GtkScrolledWindow. This is effectively the opposite of where the scroll
- * bars are placed.
- */
-typedef enum
-{
-  GTK_CORNER_TOP_LEFT,
-  GTK_CORNER_BOTTOM_LEFT,
-  GTK_CORNER_TOP_RIGHT,
-  GTK_CORNER_BOTTOM_RIGHT
-} GtkCornerType;
-
 /**
  * GtkPackType:
  * @GTK_PACK_START: The child is packed into the start of the box
@@ -440,22 +417,6 @@ typedef enum
   GTK_PATH_CLASS
 } GtkPathType;
 
-/**
- * GtkPolicyType:
- * @GTK_POLICY_ALWAYS: The scrollbar is always visible.
- * @GTK_POLICY_AUTOMATIC: The scrollbar will appear and disappear as necessary. For example,
- *  when all of a #GtkCList can not be seen.
- * @GTK_POLICY_NEVER: The scrollbar will never appear.
- *
- * Determines when a scroll bar will be visible.
- */
-typedef enum
-{
-  GTK_POLICY_ALWAYS,
-  GTK_POLICY_AUTOMATIC,
-  GTK_POLICY_NEVER
-} GtkPolicyType;
-
 /**
  * GtkPositionType:
  * @GTK_POS_LEFT: The feature is at the left edge.

diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index 503b3d707ea8b39e0385dc74729163bf3b668047..443a8c9a0f2452f769f21f130e7e8195c29b0333 100644 (file)
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -94,6 +94,47 @@ struct _GtkScrolledWindowClass
 };
 
 
+/**
+ * GtkCornerType:
+ * @GTK_CORNER_TOP_LEFT: Place the scrollbars on the right and bottom of the
+ *  widget (default behaviour).
+ * @GTK_CORNER_BOTTOM_LEFT: Place the scrollbars on the top and right of the
+ *  widget.
+ * @GTK_CORNER_TOP_RIGHT: Place the scrollbars on the left and bottom of the
+ *  widget.
+ * @GTK_CORNER_BOTTOM_RIGHT: Place the scrollbars on the top and left of the
+ *  widget.
+ *
+ * Specifies which corner a child widget should be placed in when packed into
+ * a #GtkScrolledWindow. This is effectively the opposite of where the scroll
+ * bars are placed.
+ */
+typedef enum
+{
+  GTK_CORNER_TOP_LEFT,
+  GTK_CORNER_BOTTOM_LEFT,
+  GTK_CORNER_TOP_RIGHT,
+  GTK_CORNER_BOTTOM_RIGHT
+} GtkCornerType;
+
+
+/**
+ * GtkPolicyType:
+ * @GTK_POLICY_ALWAYS: The scrollbar is always visible.
+ * @GTK_POLICY_AUTOMATIC: The scrollbar will appear and disappear as necessary. For example,
+ *  when all of a #GtkCList can not be seen.
+ * @GTK_POLICY_NEVER: The scrollbar will never appear.
+ *
+ * Determines when a scroll bar will be visible.
+ */
+typedef enum
+{
+  GTK_POLICY_ALWAYS,
+  GTK_POLICY_AUTOMATIC,
+  GTK_POLICY_NEVER
+} GtkPolicyType;
+
+
 GDK_AVAILABLE_IN_ALL
 GType          gtk_scrolled_window_get_type          (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index a12d5d8830427c583f14896abec9e29d075b4897..dd4666288fd9379622eba2cd1c44c60661373ab5 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -34,6 +34,7 @@
 #include "gtkstyleproviderprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkversion.h"
+#include "gtkscrolledwindow.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"